tab order and activate log when events are empty
Thiago Talma
1 changed files with 11 additions and 9 deletions
+ 11
- 9
app/assets/javascripts/components/utils.js.coffee
@@ -100,24 +100,24 @@ class @Utils |
||
| 100 | 100 |
.done (json) => |
| 101 | 101 |
Utils.showDynamicModal """ |
| 102 | 102 |
<!-- Nav tabs --> |
| 103 |
- <ul class="nav nav-tabs" role="tablist"> |
|
| 104 |
- <li role="presentation" class="active"><a href="#log" aria-controls="log" role="tab" data-toggle="tab">Log</a></li> |
|
| 105 |
- <li role="presentation"><a href="#events" aria-controls="events" role="tab" data-toggle="tab">Events</a></li> |
|
| 106 |
- <li role="presentation"><a href="#memory" aria-controls="memory" role="tab" data-toggle="tab">Memory</a></li> |
|
| 103 |
+ <ul id="resultTabs" class="nav nav-tabs" role="tablist"> |
|
| 104 |
+ <li role="presentation"><a href="#tabEvents" aria-controls="tabEvents" role="tab" data-toggle="tab">Events</a></li> |
|
| 105 |
+ <li role="presentation"><a href="#tabLog" aria-controls="tabLog" role="tab" data-toggle="tab">Log</a></li> |
|
| 106 |
+ <li role="presentation"><a href="#tabMemory" aria-controls="tabMemory" role="tab" data-toggle="tab">Memory</a></li> |
|
| 107 | 107 |
</ul> |
| 108 | 108 |
<!-- Tab panes --> |
| 109 | 109 |
<div class="tab-content"> |
| 110 |
- <div role="tabpanel" class="tab-pane active" id="log"> |
|
| 110 |
+ <div role="tabpanel" class="tab-pane" id="tabEvents"> |
|
| 111 | 111 |
<p> |
| 112 |
- <pre class="agent-dry-run-log"></pre> |
|
| 112 |
+ <pre class="agent-dry-run-events"></pre> |
|
| 113 | 113 |
</p> |
| 114 | 114 |
</div> |
| 115 |
- <div role="tabpanel" class="tab-pane" id="events"> |
|
| 115 |
+ <div role="tabpanel" class="tab-pane" id="tabLog"> |
|
| 116 | 116 |
<p> |
| 117 |
- <pre class="agent-dry-run-events"></pre> |
|
| 117 |
+ <pre><small class="agent-dry-run-log"></small></pre> |
|
| 118 | 118 |
</p> |
| 119 | 119 |
</div> |
| 120 |
- <div role="tabpanel" class="tab-pane" id="memory"> |
|
| 120 |
+ <div role="tabpanel" class="tab-pane" id="tabMemory"> |
|
| 121 | 121 |
<p> |
| 122 | 122 |
<pre class="agent-dry-run-memory"></pre> |
| 123 | 123 |
</p> |
@@ -129,6 +129,8 @@ class @Utils |
||
| 129 | 129 |
find('.agent-dry-run-log').text(json.log).end().
|
| 130 | 130 |
find('.agent-dry-run-events').text(json.events).end().
|
| 131 | 131 |
find('.agent-dry-run-memory').text(json.memory)
|
| 132 |
+ active = if json.events.match(/^\[\s*\]$/) then 'tabLog' else 'tabEvents' |
|
| 133 |
+ $('#resultTabs a[href="#' + active + '"]').tab('show')
|
|
| 132 | 134 |
title: 'Dry Run Results', |
| 133 | 135 |
onHide: callback |
| 134 | 136 |
.fail (xhr, status, error) -> |